From 0893a3fd390d7d1fb40a0d2939852618e40c0289 Mon Sep 17 00:00:00 2001 From: Pavel Holejsovsky Date: Thu, 28 Jul 2011 13:17:35 +0200 Subject: [PATCH] Enable introspection of X11-specific functions and methods Functions dealing with native Xlib types were (skip)ed because gobject-introspection did not have correct Xlib types declarations. They are corrected now, so these GdkX11 functions can be enabled back again. https://bugzilla.gnome.org/show_bug.cgi?id=655495 --- gdk/x11/gdkcursor-x11.c | 6 +++--- gdk/x11/gdkdisplay-x11.c | 4 ++-- gdk/x11/gdkmain-x11.c | 10 +++++----- gdk/x11/gdkproperty-x11.c | 16 ++++++++-------- gdk/x11/gdkscreen-x11.c | 2 +- gdk/x11/gdkvisual-x11.c | 4 ++-- gdk/x11/gdkwindow-x11.c | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c index ae4308eff0..80f992aa88 100644 --- a/gdk/x11/gdkcursor-x11.c +++ b/gdk/x11/gdkcursor-x11.c @@ -285,12 +285,12 @@ _gdk_x11_display_get_cursor_for_type (GdkDisplay *display, } /** - * gdk_x11_cursor_get_xdisplay: (skip) + * gdk_x11_cursor_get_xdisplay: * @cursor: a #GdkCursor. * * Returns the display of a #GdkCursor. * - * Return value: an Xlib Display*. + * Return value: (transfer none): an Xlib Display*. **/ Display * gdk_x11_cursor_get_xdisplay (GdkCursor *cursor) @@ -301,7 +301,7 @@ gdk_x11_cursor_get_xdisplay (GdkCursor *cursor) } /** - * gdk_x11_cursor_get_xcursor: (skip) + * gdk_x11_cursor_get_xcursor: * @cursor: a #GdkCursor. * * Returns the X cursor belonging to a #GdkCursor. diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index 77e73cedce..561c47dadc 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -1843,9 +1843,9 @@ _gdk_x11_display_screen_for_xrootwin (GdkDisplay *display, } /** - * gdk_x11_display_get_xdisplay: (skip) + * gdk_x11_display_get_xdisplay: * @display: a #GdkDisplay - * @returns: an X display. + * @returns: (transfer none): an X display. * * Returns the X display of a #GdkDisplay. * diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c index dc57ce2d95..41b1b0a14e 100644 --- a/gdk/x11/gdkmain-x11.c +++ b/gdk/x11/gdkmain-x11.c @@ -442,7 +442,7 @@ gdk_x11_get_default_screen (void) } /** - * gdk_x11_get_default_root_xwindow: (skip) + * gdk_x11_get_default_root_xwindow: * * Gets the root window of the default screen * (see gdk_x11_get_default_screen()). @@ -456,13 +456,13 @@ gdk_x11_get_default_root_xwindow (void) } /** - * gdk_x11_get_default_xdisplay: (skip) + * gdk_x11_get_default_xdisplay: * * Gets the default GTK+ display. * - * Return value: the Xlib Display* for the display - * specified in the command line option - * or the DISPLAY environment variable. + * Return value: (transfer none): the Xlib Display* for + * the display specified in the command + * line option or the DISPLAY environment variable. **/ Display * gdk_x11_get_default_xdisplay (void) diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c index 678b196baf..ebeb39e138 100644 --- a/gdk/x11/gdkproperty-x11.c +++ b/gdk/x11/gdkproperty-x11.c @@ -207,7 +207,7 @@ lookup_cached_xatom (GdkDisplay *display, } /** - * gdk_x11_atom_to_xatom_for_display: (skip) + * gdk_x11_atom_to_xatom_for_display: * @display: A #GdkDisplay * @atom: A #GdkAtom, or %GDK_NONE * @@ -298,7 +298,7 @@ _gdk_x11_precache_atoms (GdkDisplay *display, } /** - * gdk_x11_atom_to_xatom: (skip) + * gdk_x11_atom_to_xatom: * @atom: A #GdkAtom * * Converts from a #GdkAtom to the X atom for the default GDK display @@ -313,14 +313,14 @@ gdk_x11_atom_to_xatom (GdkAtom atom) } /** - * gdk_x11_xatom_to_atom_for_display: (skip) + * gdk_x11_xatom_to_atom_for_display: * @display: A #GdkDisplay * @xatom: an X atom * * Convert from an X atom for a #GdkDisplay to the corresponding * #GdkAtom. * - * Return value: the corresponding #GdkAtom. + * Return value: (transfer none): the corresponding #GdkAtom. * * Since: 2.2 **/ @@ -373,13 +373,13 @@ gdk_x11_xatom_to_atom_for_display (GdkDisplay *display, } /** - * gdk_x11_xatom_to_atom: (skip) + * gdk_x11_xatom_to_atom: * @xatom: an X atom for the default GDK display * * Convert from an X atom for the default display to the corresponding * #GdkAtom. * - * Return value: the corresponding G#dkAtom. + * Return value: (transfer none): the corresponding G#dkAtom. **/ GdkAtom gdk_x11_xatom_to_atom (Atom xatom) @@ -450,7 +450,7 @@ _gdk_x11_display_manager_get_atom_name (GdkDisplayManager *manager, } /** - * gdk_x11_get_xatom_by_name_for_display: (skip) + * gdk_x11_get_xatom_by_name_for_display: * @display: a #GdkDisplay * @atom_name: a string * @@ -472,7 +472,7 @@ gdk_x11_get_xatom_by_name_for_display (GdkDisplay *display, } /** - * gdk_x11_get_xatom_by_name: (skip) + * gdk_x11_get_xatom_by_name: * @atom_name: a string * * Returns the X atom for GDK's default display corresponding to @atom_name. diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c index a2d1253fec..d10e73ac27 100644 --- a/gdk/x11/gdkscreen-x11.c +++ b/gdk/x11/gdkscreen-x11.c @@ -265,7 +265,7 @@ gdk_x11_screen_get_monitor_plug_name (GdkScreen *screen, } /** - * gdk_x11_screen_get_monitor_output: (skip) + * gdk_x11_screen_get_monitor_output: * @screen: a #GdkScreen * @monitor_num: number of the monitor, between 0 and gdk_screen_get_n_monitors (screen) * diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c index ad473bb734..1940a6ce59 100644 --- a/gdk/x11/gdkvisual-x11.c +++ b/gdk/x11/gdkvisual-x11.c @@ -564,12 +564,12 @@ _gdk_visual_get_x11_colormap (GdkVisual *visual) } /** - * gdk_x11_visual_get_xvisual: (skip) + * gdk_x11_visual_get_xvisual: * @visual: a #GdkVisual. * * Returns the X visual belonging to a #GdkVisual. * - * Return value: an Xlib Visual*. + * Return value: (transfer none): an Xlib Visual*. **/ Visual * gdk_x11_visual_get_xvisual (GdkVisual *visual) diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 78ec0a4992..cb3c8ff1f7 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -4738,7 +4738,7 @@ gdk_x11_get_server_time (GdkWindow *window) } /** - * gdk_x11_window_get_xid: (skip) + * gdk_x11_window_get_xid: * @window: a native #GdkWindow. * * Returns the X resource (window) belonging to a #GdkWindow. -- 2.30.2